Added rangeKey support in query