Reduce the need for mini admin