Feature/multi type