Updated object.hpp