added social goods and location support