Removing underscore dependency
Merge branch 'extra_parameters'