External annotation support added