Added more modelsish stuff