update to handle datasets