FORGE-1362: Initial refactoring