Updated to allow extra packages to include libraries to add