add modular class loading code