framework generator improved