Added base content and removed redirection