support for internal classes (in progress)