Made slightly more package-specific