Finish the models module