Modified migrations and model to match Rails Convetions