Add check for fields