CDAP-811: replace procedures for services