Added support for extended arguments