Switching to Hash Keys Instead of Strings