Updated faq class