Add support for qualified types
Cleanup