Improved built in checks