Requesting to add kseinya's updated database code