added support for lib classes