Several improvements to code of CPController and it performance