Enhanced secondary object type support