Add complex guardian support