Added service interfaces. Fixed issues with mapping.