Finally correct database model