Updated __init__ params to be consistent across major constructs