+ Replaced tupples with strict data types