Modified to reflect module load pattern.