Refactoring of Core Admin and more...