cm: bring back functions

Change-Id: I45a93324f3d62ac3c2175a73a9f5e87590f8a639