Readded buffer keys