Updated for newer module spec.