[Jason, Evgeny] fixing and refactoring component copy