Added buffered library extension