Added faith traits and PFS stub