Added more checks options