Added FAKE support