Add converter service for customer seervice and remove some bugs