Extend collection times support