As discussed at api review, attributes is preferred to kwargs Change-Id: I8d3c6ed8f25ddea44d86f4b40c7172d8fa9be103