moved a lot of properties to new format