Greatly simplified data types and parsing