Added updated database structure
updated