Loader interface refactor with more buffers