More Work On Database Handling