Continued work on database model