Initial annotation support