Add back checking for required arguments