diff --git a/composer.json b/composer.json
index 74807a0..1dc0cc9 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,11 @@
     "description": "Libero PHP coding standard",
     "type": "phpcodesniffer-standard",
     "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "Libero\\CodingStandard\\": "src/"
+        }
+    },
     "autoload-dev": {
         "psr-4": {
             "tests\\Libero\\CodingStandard\\": "tests/"
diff --git a/src/Libero/Sniffs/WhiteSpace/ObjectStaticOperatorSpacingSniff.php b/src/Libero/Sniffs/WhiteSpace/ObjectStaticOperatorSpacingSniff.php
new file mode 100644
index 0000000..c1cf95b
--- /dev/null
+++ b/src/Libero/Sniffs/WhiteSpace/ObjectStaticOperatorSpacingSniff.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Libero\CodingStandard\Libero\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ObjectOperatorSpacingSniff as BaseObjectOperatorSpacingSniff;
+use const T_DOUBLE_COLON;
+
+// This is only present to allow double colons to have separate configuration to the regular object operator.
+
+final class ObjectStaticOperatorSpacingSniff extends BaseObjectOperatorSpacingSniff
+{
+    public function register()
+    {
+        return [T_DOUBLE_COLON];
+    }
+}
diff --git a/src/Libero/ruleset.xml b/src/Libero/ruleset.xml
index f2ce2c7..e81b69e 100644
--- a/src/Libero/ruleset.xml
+++ b/src/Libero/ruleset.xml
@@ -11,6 +11,7 @@
     </rule>
 
     <rule ref="Generic.PHP.LowerCaseType"/>
+    <rule ref="PEAR.WhiteSpace.ObjectOperatorIndent"/>
     <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility">
         <properties>
             <property name="fixable" value="true"/>
@@ -44,10 +45,11 @@
     <rule ref="Squiz.Classes.ClassFileName"/>
     <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">
         <properties>
-            <property name="ignoreNewlines" value="false"/>
+            <property name="ignoreNewlines" value="true"/>
         </properties>
     </rule>
     <rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
+    <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>
diff --git a/tests/cases/whitespace/method-call b/tests/cases/whitespace/method-call
index 2a3edb0..e37ff33 100644
--- a/tests/cases/whitespace/method-call
+++ b/tests/cases/whitespace/method-call
@@ -5,7 +5,7 @@ Method calls must not have unnecessary whitespace
 
 declare(strict_types=1);
 
-$foo -> bar ( $arg1 );
+$foo -> bar ( $arg1 ) -> baz ( );
 
 $foo
 -> bar ($arg1
@@ -13,19 +13,30 @@ $foo
 -> baz ($arg1
 ,$arg2);
 
+$fooBar()
+    ->baz()
+    ->qux()
+;
+
 ---FIXED---
 <?php
 
 declare(strict_types=1);
 
-$foo->bar($arg1);
+$foo->bar($arg1)->baz();
 
-$foo->bar(
-    $arg1,
-    $arg2
-)->baz(
-    $arg1,
-    $arg2
-);
+$foo
+    ->bar(
+        $arg1,
+        $arg2
+    )
+    ->baz(
+        $arg1,
+        $arg2
+    );
+
+$fooBar()
+    ->baz()
+    ->qux();
 
 ---