CFComms refactor working with all apps