SW-98. Add a couple of missing modules.