Updated interfaces, created SortMode class