added types and labels