Generator/Scheduler : Cleaned type_subfamily and several bugs