Add basic data structures and utility classes