custom loader improvements