Improved loader wrapper