refactor admin bundle 4