Added support for multiple days and sorting