Agreed, but I don't want to change it too much as I don't have test environment for HMAC testing.