Updated model objects to manually parse XML