Move custom elements out of params to allow us to pass them in externally