add support for security groups and some evolutions