Updated Operation types and empty modification & validation