changed issue with framework structure