Added some extra data structures in preparation for the next deliverables