Now resolves datasets just fine