Added support for new values in command arg