Change connection() to use only options