[#1242] Added the Context module