Adding indexes to event and service