Added support for terminal arguments