Heavy refactoring to be compatible with EE 1.13 and CE 1.8's code
Disappear handling