Changed to support Hstore