Add a few classes to optimize config.