Change in the way we solve the problems in AstFactoryTC