Re-factoring fixes for CEP pack