Added index and make join outer