Add strict mode to support network