Added a couple of new data structures (fixes #22)