Processing code review, some config cleanup and expanding on the data model.