Modified schema script and dbhandler