refactored package spec according to 7de08b7a4a8c30