Made data types more reasonable