Refactor of built-in arguments