Added support for enclosing method and general inner class info