add annotation support
compile fix