Topic/add support for ordering