Added a few essential data structures