Added different types of buffer