Removed TSM dependency