Changes for RulesContextFileBuilder #9