Added subpackageName option