made a more intuitive data validation structure to allow for future-proofing