Added 2 TODOs to the Context Engine