Rearchitected in more modular style