- added new regex to extract keys