Continue work on FAQ module