Add proper admin flag support