Moved Format into Connection