Adding functionality for managment of CDB and KGB