Added cmdline parameter to include primitives
Refactoring