Improve ActiveRecord Class