Added tags to the client