Reuse branch for new refaktoring