Updated to use package metadata