Updated fbo class