Refactoried BufferService