Improvements to Topic detailed