Add model, fix problems