Added identify/rename mode. Added caching to string matches