Working on model and data import