[HELIX-238] Refactor, add update to accessors, test update logic