Changes to employee service and some refactoring.