Updated to support changes per JLindquist