Adding administration capabilities