Completed multi-type support