Added setting for custom sort