Feature/external redirect