Admin and data handling updates