Various changes to property definition.