Feature/admin improvements

Nice helper