Update to use configurable FB values