Fire Savant enhancements