Adding XML annotation handling