Cleaned up database sheme
Cleaned up database sheme