Fixed Database storing issues