Added key parsing.