Semantic changes + updated SocialController to use the plus plugin