More updates for use with activerecord-hackery gem version