Added a switch for the OS layer
Extended the Buffer and BufferPool