Re-factoring fixes to CEP adaptors + Added necessary features