Partial 2.4.1

Fixed database model