Indentation
Use lock macro
Make executor care about index merge specification