Fixed kvp setup for arguments