Add indexes for better performance