Added more code for the models