Create proper mappings to fix tag and argument settings

Close #96.