Continued 'Social' API Refactor