Add more module support to places that don't have it.