Use versions instead of an EE flag