Goal and AmazonGoal class updated