main functions in analyzer and resolver are updated