Accept kwargs to support older syntax