Continuing to work on databse model