Added rate and channels buffering