Add support for lazyloading classes