Enhanced Fire class