Added security group tagging support