Improve definition of packages