PhpStorm code reformating
Added Scope enum
Problems with merge