Added support for Kinesis