Service and directive refactor