Added faker support