Improved that way that command arguments and pull arguments are handled