Introduce DataRegistry. Code now passes all JUnit tests.