Taken out the dependency of the EE version