Feature/data api annotators (omx independent annotators)