Added both connection and variables