spelling fix and attribute update
including xml as dependency
removed check for nil entity