Overrided some methods to correctly handle our new model