Add prep for custom analyzers / variable name analyzer