Added version property, did some refactoring / renaming and added a larger data set.