Updates to handle v1 datasets