* Re-factored the structured and raw buffers methods