diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 0627b026a..f66042075 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,10 +11,11 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Object\Photo;
 
-require_once('mod/share.php');
-require_once('mod/parse_url.php');
-require_once('include/text.php');
+require_once 'mod/share.php';
+require_once 'mod/parse_url.php';
+require_once 'include/text.php';
 
 function fromgplus_install() {
 	register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@@ -263,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 	}
 
 	if ($cleaned["full"] != "")
-		$infoFull = get_photo_info($cleaned["full"]);
+		$infoFull = Photo::getInfoFromURL($cleaned["full"]);
 	else
 		$infoFull = array("0" => 0, "1" => 0);
 
 	if ($cleaned["preview"] != "")
-		$infoPreview = get_photo_info($cleaned["preview"]);
+		$infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
 	else
 		$infoFull = array("0" => 0, "1" => 0);
 
@@ -348,13 +349,14 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
 			case "photo":
 				// Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
-				if ($shared)
+				if ($shared) {
 					$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-				else {
-					if ($attachment->fullImage->url != "")
-						$images = store_photo($a, $uid, "", $attachment->fullImage->url);
-					elseif ($attachment->image->url != "")
-						$images = store_photo($a, $uid, "", $attachment->image->url);
+				} else {
+					if ($attachment->fullImage->url != "") {
+						$images = Photo::storePhoto($a, $uid, "", $attachment->fullImage->url);
+					} elseif ($attachment->image->url != "") {
+						$images = Photo::storePhoto($a, $uid, "", $attachment->image->url);
+					}
 				}
 
 				if ($images["preview"] != "") {
@@ -365,8 +367,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 					$post .= "\n[img]".$images["full"]."[/img]\n";
 					$pagedata["images"][0]["src"] = $images["full"];
 
-					if ($images["preview"] != "")
+					if ($images["preview"] != "") {
 						$pagedata["images"][1]["src"] = $images["preview"];
+					}
 				}
 
 				if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 358a22571..9cf2461fe 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -5,7 +5,6 @@
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
-
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -1046,8 +1045,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 		*/
 	}
 
-	if (function_exists("update_contact_avatar"))
-		update_contact_avatar($contact->image->url, $uid, $contact_id);
+	Contact::updateAvatar($contact->image->url, $uid, $contact_id);
 
 	return($contact_id);
 }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 94393313e..3c6ac4995 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -49,6 +49,7 @@ require_once 'include/enotify.php';
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\GlobalContact;
+use Friendica\Object\Photo;
 
 class StatusNetOAuth extends TwitterOAuth {
     function get_maxlength() {
@@ -999,7 +1000,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 
 		require_once("Photo.php");
 
-		$photos = import_profile_photo($contact->profile_image_url,$uid,$contact_id);
+		$photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
 
 		q("UPDATE `contact` SET `photo` = '%s',
 					`thumb` = '%s',
@@ -1026,7 +1027,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 
 			require_once("Photo.php");
 
-			$photos = import_profile_photo($contact->profile_image_url, $uid, $r[0]['id']);
+			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
 
 			q("UPDATE `contact` SET `photo` = '%s',
 						`thumb` = '%s',
diff --git a/twitter/twitter.php b/twitter/twitter.php
index f0c71cf41..de0ba71ac 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -64,6 +64,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Model\GlobalContact;
+use Friendica\Object\Photo;
 
 require_once 'include/enotify.php';
 
@@ -950,7 +951,7 @@ function twitter_fix_avatar($avatar) {
 
 	$new_avatar = str_replace("_normal.", ".", $avatar);
 
-	$info = get_photo_info($new_avatar);
+	$info = Photo::getInfoFromURL($new_avatar);
 	if (!$info)
 		$new_avatar = $avatar;
 
@@ -1027,7 +1028,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 		require_once("Photo.php");
 
-		$photos = import_profile_photo($avatar, $uid, $contact_id, true);
+		$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
 
 		if ($photos) {
 			q("UPDATE `contact` SET `photo` = '%s',
@@ -1060,7 +1061,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 			require_once("Photo.php");
 
-			$photos = import_profile_photo($avatar, $uid, $r[0]['id'], true);
+			$photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
 
 			if ($photos) {
 				q("UPDATE `contact` SET `photo` = '%s',