Add support for talks
Improve variable naming