Added variable searching