Refactoring point of interest types to be subclasses instead of composition-based, it works better for their use cases.