Made env parsing more robust and setup for adding tags to services
Adding support for service tags