Add the ability to include arbitrary arguments