Added ActiveRecord 4.1 support