Issue #201: Runtime refactoring