Various modifications to adapt with Ecobox project requirements.