Added metatdata to more entities.