Add check for required arguments