Added data structures

Merge