Move all properties to fields array, add subfield to 'link' type