Changed storage method from values to a single Dictionary so we don't have to reflect