Pulled all parameters out to object shared at top level