Extract store lets into helper
Fix EntityReferences namings
Use @references explicitely
Rename Ref to Pointer