Swapped keys for stored values to constants
Added new interface for our implementation of datasets
Added missing bits to previous commit