Modifications to auth library