Added set validation