variable templates updated for PCH serialization... Still working on test cases...