Improve sword modules interface