Changes to allow for authentication