Changed data types in tables as requested