[HELIX-109] Review Helix model package, more changes