Made EE dependencies optional