Added new database design stuff