Mainly added Facebook support