Fixed additional checks for experiment & data type