Port regex and parsing fixed