Added Faidoc modifications