changed database structure to allow for inheritance in future