Add checks for required values