Draft: Refactoring infrastructure