-Refactored Quadruple into Tuple, with more data