Add back in multiple dataset support

Since most of the code is there we should at least try and support multiple datasets.

Change-Id: I83a4994919b376335ffbfb1fa40c4ecc9c7f9aeb