Improved FBO class