Add validation of variables