Fixed reading from db and data model