Added support for picking times