Changes to connection

Used |DataDirectory| instead of ridiculous regex acrobatics.