custom loader improvements.