Better handling for the property/method lists
A more robust handling of combining XML files when they already exist.