Improve loader