Add support for both non-Timeline API and Timeline API