[#703 Wizard] Dynamic keywords, mapping for categorical units, more source_* keywords