Packaged for better cross-platform use