Refactor #5886 Refactor Facebook API