Updated active record class