Add auto event track support