Fix reference
Remove not found references
XML annotation