Added data classes in preparation for next update.