Add has uid check