ActiveRecord and models
Corrections for PR