Update vars, defines