Update Goal to handle new badge structure