Refactored TSW modules