Schema changes to support image annotation (unfinished)