Tweaks to active record class