Updating code base to work with new ActiveRecord