Add support for system context definitions - wip