LinkColumn and EnumColumn improvements