Decouple constructor args from attributes.
Updated per API change.