Added more support for Keys. We may not need all of these, but it's
better to put them in anyways.