Added registry functional to CMF