FlameChart refactoring Part 3