Fixed imports for timeline feature