updates #1: Change storage strategy (it's one collection per job now).
Merge branch 'issue-1' into develop