Added CEP5 support