HMACs are now properly added. They are not yet used though