Add support for nested datasets