Updated Cart validation structure