conforming to bigtable-model changes, generic map