[FEATURE] Seperated HMAC handler from code