Add simple buffer service. Small refactoring.