Refactoring of FBHelper, split up in several classes