Improved SDK to support annotation features