Upgraded parameters fetching and regex