Added trace support for development
Service restructuring