Added another dataset; some refactoring