Adding auto-load support