Ej2 refactory