Re-worked properties.schema