Move eec logic into manager