Merge minimal admin classes into normal admin