Updated Contextual variables module.