Added code for .set and .get