Scarecrow update for refactoring in forge