Point at an actual version
Added support for annotations