added support for public classes