Revised annotation model and examples.