Add support for system context definitions