Rework on the structure of FaqBundle