Added package references and solutions