Refactored to use FibManager