Re-enable server string; add SQL