Use diamond, change field type