Replace variable info and better generic support.