excluding the NAT instances and refactoring