Refactor for puppet master
Renamed to admin subclass