Updated package declarations