Changed ordering of __init__ params to be more consistent across core constructs