Making some improvements on social addon #49