resolve annotation support added