Added support for daily and monthly delivery