Massive update with more modular design