Refactoring, objects update