Adapt to change from def/context to sys/context