Update the regex and optimised some part of the code
Changed default values