Improve : ActiveRecord support