Updated for authentication