Added more models and methods