Some refactorings on coordinates to store the coordinates in the table itself, not in a inner table.