Reorganized the model a bit