refactoring job.xml, using macros