Improve BufferedLayer