Implement more checks