MOD: Changed Context definition