Feature/sort type