Add more checks