Moved buffering to ObjectManager