Improvements to speaker template