added separate validator