Added strict type-checking.