Feature/n4 cja refacto2