re-add application-context for graphbuilder and update