Updated wrapper for different load methods