Add support for hypens in keys