More additions to the model and db