Tweaking rubber tree gen
Re-add FactoryRegistry because IMC messags are stupid-ified