Changes for RulesContextFileBuilder