Update comment
Support class, function that are declared conditionally
Improved function, class name comparation