Adding in more property info and defining lists/maps as containers.