Update code to remove from_hstore calls