Redo registry handling and Annotations