Removed Buffer dependency.