change mapping from xml to annotations