Improve generateMaskSet + add definitionSymbol property in definitions