add entities and xml marshalling