Merge "Introduce property types"