Cleaner way to handle the auto load