Refactored the object structure slightly - more to come
Refactored how data is stored in the internal dictionary