Add fireThat feature