Tidy up old code
Implemented new INFO_TYPE to accommodate direct referencing using HANDLE