Add basic data structures and storage component