Property-ized the shape and body