Added custom DB indexes