Added Object and Scene classes