Added correct backward compatibility to module load