Add support for arguments