Admin functions added (but untested)