[improvement] Re-impl of OsgifyModelBuilder