Moved the content class to the Buffer class