Added support for direct references to Complex types