Service refactoring
Still deployment issues