Added extended list of checks