23 Update for ActiveRecord 4.1.x