Fixed Yii2 refactor