Extended object model and cleaned up GPX input methods.