Warning cleanup
Actually append CPT entries to the Hierarchy