* Better code organization to only load classes when needed