Added data types and didn't break tests