Those are all still statically compiled in, so nothing changes for now. The next step is to break out at least the PBF one then.