refactor admin bundle 6