Migrated to EE2.x

Tested with EE 2.4.0