Started new version of argument identification