Started entity refactoR