Dataset condition check added