Added more data and a few helper methods.