Added support for CDI / Session Cleaning & Basic pages