Changes for HMAC Authentication, but not finished