Adapted to new embeeded package