Reordered properties
Updated configuration