Added name field to Gateway table & UniqueGateway custom attribute