fixing framework architecture issue