added support for arguments