COMMONS-190: update api and registry