Improved consistency and handling of both ways of handling Sword modules