Added support for fireball payloads.
Added expansion of common terms.