FORGE-1223: Simplified code