Started refactoring on admin console.