Admin functions polished