diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..723ef36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..b83d832
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,11 @@
+{
+  "name": "mvanmeerbeck/wp-api-yoast-meta",
+  "type": "wordpress-plugin",
+  "authors": [
+    {
+      "name": "Maxime Vanmeerbeck",
+      "email": "mvanmeerbeck@shopbot-inc.com"
+    }
+  ],
+  "require": {}
+}
\ No newline at end of file
diff --git a/plugin.php b/plugin.php
index 53dab5a..5ea78f1 100644
--- a/plugin.php
+++ b/plugin.php
@@ -10,109 +10,99 @@
  */
 class WPAPIYoastMeta {
 
-	protected $keys = array(
-		'yoast_wpseo_focuskw',
-		'yoast_wpseo_title',
-		'yoast_wpseo_metadesc',
-		'yoast_wpseo_linkdex',
-		'yoast_wpseo_metakeywords',
-		'yoast_wpseo_meta-robots-noindex',
-		'yoast_wpseo_meta-robots-nofollow',
-		'yoast_wpseo_meta-robots-adv',
-		'yoast_wpseo_canonical',
-		'yoast_wpseo_redirect',
-		'yoast_wpseo_opengraph-title',
-		'yoast_wpseo_opengraph-description',
-		'yoast_wpseo_opengraph-image',
-		'yoast_wpseo_twitter-title',
-		'yoast_wpseo_twitter-description',
-		'yoast_wpseo_twitter-image'
-	);
-
-	function __construct() {
-		add_action( 'rest_api_init', array( $this, 'add_yoast_data' ) );
-	}
-
-	function add_yoast_data() {
-		// Posts
-		register_api_field( 'post',
-			'yoast_meta',
-			array(
-				'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
-				'update_callback' => array( $this, 'wp_api_update_yoast' ),
-				'schema'          => null,
-			)
-		);
-
-		// Pages
-		register_api_field( 'page',
-			'yoast_meta',
-			array(
-				'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
-				'update_callback' => array( $this, 'wp_api_update_yoast' ),
-				'schema'          => null,
-			)
-		);
-
-		// Public custom post types
-		$types = get_post_types( array(
-			'public'   => true,
-			'_builtin' => false
-		) );
-		foreach ( $types as $key => $type ) {
-			register_api_field( $type,
-				'yoast_meta',
-				array(
-					'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
-					'update_callback' => array( $this, 'wp_api_update_yoast' ),
-					'schema'          => null,
-				)
-			);
-		}
-	}
-
-	/**
-	 * Updates post meta with values from post/put request.
-	 * @param array $value
-	 * @param object $data
-	 * @param string $field_name
-	 *
-	 * @return array
-	 */
-	function wp_api_update_yoast( $value, $data, $field_name ) {
-
-		foreach ( $value as $k => $v ) {
-
-			if ( in_array( $k, $this->keys ) ) {
-				! empty( $k ) ? update_post_meta( $data->ID, '_' . $k, $v ) : null;
-			}
-		}
-
-		return $this->wp_api_encode_yoast( $data->ID, null, null );
-	}
-
-	function wp_api_encode_yoast( $post, $field_name, $request ) {
-		$yoastMeta = array(
-			'yoast_wpseo_focuskw'               => get_post_meta( $post['id'], '_yoast_wpseo_focuskw', true ),
-			'yoast_wpseo_title'                 => get_post_meta( $post['id'], '_yoast_wpseo_title', true ),
-			'yoast_wpseo_metadesc'              => get_post_meta( $post['id'], '_yoast_wpseo_metadesc', true ),
-			'yoast_wpseo_linkdex'               => get_post_meta( $post['id'], '_yoast_wpseo_linkdex', true ),
-			'yoast_wpseo_metakeywords'          => get_post_meta( $post['id'], '_yoast_wpseo_metakeywords', true ),
-			'yoast_wpseo_meta-robots-noindex'   => get_post_meta( $post['id'], '_yoast_wpseo_meta-robots-noindex', true ),
-			'yoast_wpseo_meta-robots-nofollow'  => get_post_meta( $post['id'], '_yoast_wpseo_meta-robots-nofollow', true ),
-			'yoast_wpseo_meta-robots-adv'       => get_post_meta( $post['id'], '_yoast_wpseo_meta-robots-adv', true ),
-			'yoast_wpseo_canonical'             => get_post_meta( $post['id'], '_yoast_wpseo_canonical', true ),
-			'yoast_wpseo_redirect'              => get_post_meta( $post['id'], '_yoast_wpseo_redirect', true ),
-			'yoast_wpseo_opengraph-title'       => get_post_meta( $post['id'], '_yoast_wpseo_opengraph-title', true ),
-			'yoast_wpseo_opengraph-description' => get_post_meta( $post['id'], '_yoast_wpseo_opengraph-description', true ),
-			'yoast_wpseo_opengraph-image'       => get_post_meta( $post['id'], '_yoast_wpseo_opengraph-image', true ),
-			'yoast_wpseo_twitter-title'         => get_post_meta( $post['id'], '_yoast_wpseo_twitter-title', true ),
-			'yoast_wpseo_twitter-description'   => get_post_meta( $post['id'], '_yoast_wpseo_twitter-description', true ),
-			'yoast_wpseo_twitter-image'         => get_post_meta( $post['id'], '_yoast_wpseo_twitter-image', true )
-		);
-
-		return (array) $yoastMeta;
-	}
+    protected $keys = array(
+        'yoast_wpseo_focuskw',
+        'yoast_wpseo_title',
+        'yoast_wpseo_metadesc',
+        'yoast_wpseo_linkdex',
+        'yoast_wpseo_metakeywords',
+        'yoast_wpseo_meta-robots-noindex',
+        'yoast_wpseo_meta-robots-nofollow',
+        'yoast_wpseo_meta-robots-adv',
+        'yoast_wpseo_canonical',
+        'yoast_wpseo_redirect',
+        'yoast_wpseo_opengraph-title',
+        'yoast_wpseo_opengraph-description',
+        'yoast_wpseo_opengraph-image',
+        'yoast_wpseo_twitter-title',
+        'yoast_wpseo_twitter-description',
+        'yoast_wpseo_twitter-image'
+    );
+
+    function __construct() {
+        add_action( 'rest_api_init', array( $this, 'add_yoast_data' ) );
+    }
+
+    function add_yoast_data() {
+        // Posts
+        register_api_field( 'post',
+            'yoast_meta',
+            array(
+                'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
+                'update_callback' => array( $this, 'wp_api_update_yoast' ),
+                'schema'          => null,
+            )
+        );
+
+        // Pages
+        register_api_field( 'page',
+            'yoast_meta',
+            array(
+                'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
+                'update_callback' => array( $this, 'wp_api_update_yoast' ),
+                'schema'          => null,
+            )
+        );
+
+        // Public custom post types
+        $types = get_post_types( array(
+            'public'   => true,
+            '_builtin' => false
+        ) );
+        foreach ( $types as $key => $type ) {
+            register_api_field( $type,
+                'yoast_meta',
+                array(
+                    'get_callback'    => array( $this, 'wp_api_encode_yoast' ),
+                    'update_callback' => array( $this, 'wp_api_update_yoast' ),
+                    'schema'          => null,
+                )
+            );
+        }
+    }
+
+    /**
+     * Updates post meta with values from post/put request.
+     * @param array $value
+     * @param object $data
+     * @param string $field_name
+     *
+     * @return array
+     */
+    function wp_api_update_yoast( $value, $data, $field_name ) {
+
+        foreach ( $value as $k => $v ) {
+
+            if ( in_array( $k, $this->keys ) ) {
+                ! empty( $k ) ? update_post_meta( $data->ID, '_' . $k, $v ) : null;
+            }
+        }
+
+        return $this->wp_api_encode_yoast( $data->ID, null, null );
+    }
+
+    function wp_api_encode_yoast( $post, $field_name, $request ) {
+
+        foreach (array_keys(get_taxonomies(['public' => true, 'hierarchical' => true])) as $taxonomy) {
+            $this->keys[] = 'yoast_wpseo_primary_' . $taxonomy;
+        }
+
+        foreach ($this->keys as $key) {
+            $yoastMeta[$key] = get_post_meta($post['id'], '_' . $key, true);
+        }
+
+        return (array) $yoastMeta;
+    }
 
 }