Changed default port for application
Added enricher functionality
Removed leaky encapsulation in EnrichmentService and added more unit testing