Added service configuration + Tidy up

Added service configuration + Tidy up