Infrastructure refactor