Adding checks for required params