Removing unnecessary coupling from CApp