Add model and move objects from main