Add old package support