Add set data structure
Merge branch 'set' into develop