Updated strict type checking