Updated module definitions.