18500 charger and powerpack?

Currently using a Xstar PB2 with 2x18650 for a travel charger and powerpack. Actually very happy with it but I want to transition my travel light to a FM 18500 I built to allow for dual fuel use. The PB2 will require a battery spacer. Are there any similar charges that will work with 18650 and 18500?