Much better HCP storage method, verify and add a value from SAGE