changes to model for easier import