Updated with trick to find demangled type