Added check for name