Added comments and icon_field and choices for link type.