Renamed ContextImpl, fixed TODOs in Context implementation