Added more admin features