Updated package setup