added Kinesis and CLoudwatch features