Support Custom Field Suite. fixes #26