Consolidate into hstore package