Modifying regex to allow for new connection types