Tidied up the extended properties