Updated Post-Mortem & removed DynamicListeners