Improved the handling of pull arguments