Refactored DataContainer and Result classes for greater clarity