Adds better support for activating conventions