Updated to reflect new __init__ call spec changed in 4d145a4