Updated setup to work with modular design