Allow additional arguments to pass through
Add internal usage notes