Fixing Relations and migrations

@AhmedElassuty