Revamp model manager factory as bundle friendly.