This thesis explores ways to improve the framework for performance-fire safety engineering of buildings. Performance-based building codes have been widely adopted, as they allow regulators to set the ambitions by policies ...