Add typename #18