Modified common call using regex to improve condition checking