Added support for Thunderball