Name check added