Added support for buffers
Changed some stuff