refactor admin bundle 5