refactor MAPE bundle