Refactor of some classes affected by Element change