Ported over some models to Workbench EER