Working on the model and data import