Changes for authentication