Improve loading to buflisted