Add multi tier architecture to support minor versions