Modifications for module to be external