Completed the modular architecture