Added some generic data structures