Added support for deferred type resolution, working for qualified names and annotations