Handle data structures in a more OOA way.