Converted to stand-alone module.