Improve private checks