Improved with recurring events support