Ported ModularPots to 1.6.x branch