ModifAction enum added NONE operation + additional checks