Adding missing typenames