Added option to turn on/off modular build