switched from multiname to own types