Added some data structures for access