Integrated ArgumentFactory.
Merge branch 'revadd'