Add the last few changes from data model with tests!