Removed auth related code for simplicity