Added HAPI and modular design