Better representation of floats
Removed unneeded tuple parameters
Added countrycodes as type