Redoing Registry annotation with their own files
Redo registry handling and Annotations