Change to dynamic fabi support for future devices