Add annotation support