Changed __init__() signature to handle kwargs for backwards compatability