Added ObjectEntity