added HashSet and storage
more updates to new module format