Add support for modular installs