Added support for unresolved typ annotations (instead of not adding the
annotation at all)