Updated to work with latest EE & CT versions