Tables indexes refactored