add multi section support