Updated to use 0.23.5 properties.