CDB-1306 Api mostly done except NamedMap update. Pending finishing tests too