Use typetag later

latest merge request