Update Object.h and Object.cpp