Changed the way we are embedding the objects