Implemented new modular architecture