Move eec logic into manager
Merge pull request #701 from arnaudbey/eec-manager

Move eec logic into manager