Refactoring of constants
Regeneration of Add methods