Changing the models for better use