More work on annotations