Refactored FB api