Add more checks and references
1 file changed