improve annotation support