Extensions and enhancements to TMSU