Improved management of arguments