Add Diaspora support

Add Diaspora support