Added support for timelines