GoldenPoppy adapted to core changes