Add ability to custom sort