Modified Database Script