Refactored adding parser args