Added FAQ 2.2 support