Adds support for arguments