Adding back redirects and big lookups