Add uniquness validation