Added extra auth checks