Migrate to active record pattern 2.6