Better modularization of extensions