Adding annotation option support.