Used more efficient data types where possible