Little changes to data model handling.