Added environment variable and serialization of more objects