Refractor admin stuff for 1.6