server updated to not use annotations (not sure with this)