Fix command line passing.
Fix attribute mapping.