Started to refactor
Refacor merge
Again one of this merge conflicts :( Merge remote-tracking branch
'origin/TCA-Team' into TCA-Team