Start adding additional annotation support.