Get rid of buffer interfaces and make concrete classes final