Moved the comment block to correct place
Removed the obsolete interface to referencing types
Include reorganisation
Type initialisation from type