Adding check for field