Switch to modular design for gates