Removed requirement to pass in underscore to machina module