Add initial draft of some annotations