Adds support for custom arguments from factories