Groundwork done to support multiple authentication mechanisms