Fixed finding important params and variables