change specs to adapt to the new entities format