Added sort and time options