add support for security groups, and other evolutions