Use command arguments of type Map to support environment variables with dynamic names

Use command arguments of type Map to support environment variables with dynamic names #167