Add auto fake support