Refactoring of compiler predicates for saving entity source data