Feature/handle redirect