Updated parser to use format_keys