MDL-31989: Optimiztion in admin/ + schema & access update