Updated exception packages
Adoptions to lib