Updated context constants
Context updated to current DSL