Improved redirect paths
