Add support for more time ranges