Modify the handlers to abide by the new admin thingy