Added index blocking (remove later after testing)