master - bigger update for trace fixed, model and factory slightly fixed going back to INT based Primary keys and sub class is loaded properly. mname is removed