Updated PersonGateway and DB