Changed approach on how to order the properties.