Adding slp buffer support