Breaking up goliath line for PSR compat