Added data types and tests