Updated Coordinate class