Added storm type and default_queries