Added version 2.1 annotations