Updated to match the ActiveRecord adapter