some changes on migrations, models and setup