Restored argument parsing