Improved FBO management