Fix for Profile Service so it can be used with service mapping property