Added xml storage mapper factory