Refactor property representation and XML parsing/serialization