MaaS: Add support for dynamic fabric numbering