Added static data structures