Finalized ContextElementManager implementation
Gave some intelligence to enumeration.