Added element id
Path renamed to geometry